Cleanup

Quick code cleanup nothing added just removing unused functions and
imports