Refactor: remove unrequired methods