Removed un-needed stuff