remove bunch of un-needed stuff