Removed persistant mode that currently doesn't work properly