Removed commented code.
Better handling of dependencies.