simplication and documentation
remove unused code, documentation