Removed exitlive dependency