Still need more cleaning up

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