You can always clean up the iPhone 4 by getting rid of the apps you don't want on your iPhone 4S and other stuff as well and then do a backup of the iPhone 4 so that when you restore from backup to your new 4S it will only carry over the apps and things you want.