minor changes
remove unused