Cleaned up dependencies
Simplified commit