Step 2, still cleaning all the things

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