Removed some extra features and unneeded code.