Removing unused shuttles and some proc calls