Removed pointless function and removed savefig option for now