Remove unneccessary dependencies
Updating TODO