remove old commented code, format