Unit II - Clean Up and Basic Metrics