* Attempt at removing some dependencies we don't need