Cleanup code and convert to 2.2.4 version
Update to 2014082606