Remove debug and die statements