Refactor and remove unnecessary methods