Cleanup and multi class fixes