Remove crap
Simplify