updated imports and cleaned up un-needed files