Clean up - part 1 - removed some dependencies