Cleanup of mistakes