Cleaned up code from debugger calls