remove extra stuff I probably shouldn't have in here at all