Cleanup

Cleaned up un used code