Removed faulty code and obsolete dependencies.