just buzzing around removing some useless stuff