base: Clean up bitmap generation code