cleanup inbottle code some more