Cleaned repo up for code freeze