cleanup and lessify