Removed old PWSCal and Custom Picker

Second commit.