Fixed MLVA to only use the singleton's variables and not use copies of its references. Also removed some unused imports