Updated including cleanup and removal of multiple dependencies.