Not sure if it is a good idea to have cleanup code here. That might be a job for migration/update code instead ?