Removed obsolete prototype code
Cleaned up unused functions
p4#: 22338