take note @birarda also removed these