Remove debugging fixes