Cleanup some drawable code