Velocity Memory removed
Refactoring