removing hardcoded aw specific stuff that someone else added