Cleanup unused methods in Plan class