remove extra stuff...I think