removed the core/target stuff