cleanup and solidify