removed unused comments and settings