added memory pool cleanup to entry files
Merge remote-tracking branch 'origin/master'
small code structure change