remove un-needed stuff for me