Removed regex-stuff