clean up old style