Cleaned up dependencies and junk code.