Cleaned up a lot of bitmap code. Still need to clean more.