2.4.0

Cleanup of repo for code transfer