the 'find_system' call removed on purpose? safe to remove?