rebase for bug hunting and .class removal