Code cleanup
Removed weird Dana* stuff from proxy