Cleaned up and updated dependencies for 6.2.0-ga1