remove legacy code, import to intelliJ