kill xflux + refactoring -_-