Remove currently unused methods