removing some debug stuff / outdated questions in comments