Constant buffer cleanup and new enums