Remove note and rest helper methods