removing old&commented code