Removed unneeded code from runtime system