CrazyCore: some code cleanup