DEV: Remove some unused functions