Removal of not used code