Remove old code
Fix :camel: for DeepDiver :P