removed commented out old functions