cleanup unused & commented code