Cleanup
NXIDE-273: ugly commit with not finished task