Cleanup code/internal marks