removing dodgy stuff for now