major drawables clean up