Removal of redundant code. <Ben>