Fix nits, remove dependencies