some cleanup and safety work
ignore