removed cigarette -> wrong fields
added sigaret + location_Cleanup