Fixed problems with previous develop merge (failed to remove deleted PTR files)