Removing unnecessary step