Simplified import
Cleanup unused stuff, #22