Removed two hacky functions leftover from when the schematics design was less clear.