.... I'm not waiting till 1.7. Time to clean up this crap

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