Cleanup code and versioning