removing some more redundant code