Removed unecessary functions, enforced a debuggable state