Remove unneeded comments and fake building object