Merge "Cleanup allocation constructor"