cleanup+docs