cleanup and removed some APM related codebase
version bumped