remove unused code
sort declarations
build