Removing unnecessary laziness