- cleanup unused code
- add placeholder.module
- fix conflicts