Code cleanup and more deletions.
Signed-off-by:thehutch