removed un-necessary calculation