Removal of surplus parameters