Refactor drawable, remove stuff that isn't necessary once the drawable is built