Updated setup and pruned other sections