got rid of excess code