cleaned up stmt references and removed custom exception handler from class