Removed unused, commented code