Remove old code, add compose key