Migrated to intellij
cleanup