minor cleanup
remove unused module
Add RTF support, cleanup