Removing code that broke it more