Remove breaking code