Remove all the separator code, this is not needed.