Minnor changes (removed unused code)