small enhancements and remove old contact page code