Remove unneeded function
Fix refactoring oversight
Remove redundancy
Fix problem with compat functions overriding each other