Removed unnecessary dependencies and commented out cruft