cleaned up comments and unneeded settings