remove old enums
remote enum for socket
fix enums in commented out code
further enum fixes
even more enum