Commented code that caused crashes