got rid of un-needed lines of code