Cleaned dependencies and stuff