Cleanups / Dependencies

@elioschmutz