Started removing useless methods