Model self imports removed