Removed unused/commented code