remove nsenter stuff and cleanup unused vars