Removal of more dead code and resources.