removed excess code that isn't needed