got rid of excess code to get rid of any warnings