some cleanup started