cleanup, add default data