Massive cleanup; remove useless dependencies