Remove useless stuff
Small helpers
More stuff