Added volume handling from cluster file, cleanup