Removed slick because the old setup seems better
Lots of cleaning up