REL-1301: Removed no longer necessary import and cleaned up.