construct: struct values
remove unused function
cleanup