Should these just be moved into Common now, considering the function counterparts don't exist anymore?