Remove dup helper methods