Removed some un-needed stuff