Some progress done and cleanup