Pushing cleanup changes
Signed-off-by:thehutch