Removed code that shouldn't be there anymore