Remove classy social, fix comments