Spring Cleaning

Signed-off-by: Ashok Bommisetti <bashok001@gmail.com>