removed the extra stuff