Testing SSH Key along with some controller cleanup fixes