Clean up, remove obsolete files
Fixes around client.super