Removing more stupidity