Removed settings and improved the substring handling