remove marvin/core dependency