Removed old code that messed things up