Removed goofy code