Merge pull request #33 from mpath/cleanup

Cleanup
Merge pull request #35 from roaet/RM3473_maxallocation_migration

Rm3473 maxallocation migration
Merge pull request #51 from mpath/master

Wat