Cleanup and future plans layes out