cleaned comments and removed unused commented code