Cleaned up dependencies and import lists