remove unneeded generic crap