Cleanup that .class mess