Removed import hack