Removed un-needed dependencies and fixed a few bugs