took out extra stuff