Remove client/server hack