removing some more stupidity