Removed them as functions and just referencing them directly.