Many many different cleanups, some preparing for when Nucleum is done
cleaning

Signed-off-by: Captain Shadows <captain_shadows@aol.com>