Started taking out unused bits and pieces