Remove unused
Cleanup & rename stuff
Cleanup & rename stuff
More java conversion fixing
Remove the size check when drawing