Now that custom arguments have been implemented we can remove the system properties and use custom arguments instead.