Removed temp code
Upgraded to core version 2.5