upgraded to 6.3.0 version with clean up of unneeded deps and code