Cleaned up and validated. Deleted startup-class files. Continues with setup2.sh