Removing stupidiy