fix build files and removing old pp