remove ewmh and tidy up