Documentation and delete useless methods