Massive cleanup
Add slim support