Remove bitmap, clean things up and reorganize