consolidate member templates and forms
remove empty files