First Update, trimming unused class's