Got rid of extra stuff