Removed useless methods not used after the refactor