refactor: removing dead build code
rstcloth reorganization