remove aaron specific stuff