Removed code that breaks stuff