add the creator
remove unused code