removed unused comments and functions