Finished cleaning the header of model plugin