Removing oefp stuff