Performance improvements

`debugger` statement has been removed