Add definitions of Rank to Basics module
Cleanup NoProofs module