Removed subs where this system is not used.