Get rid of unised methods and use the right ones