Removed excessive configuration options