I'll check, there was at least one method that had to stay...