cleanup code
tidy up
removed for now