Removed Settings references