Big import cleanup
Error code cleanup