Clean up Path and Task code