remove prop.c/h, as they were reintroduced in a bad merge (0dc7eca4cdfff6425e19a0bace...