Revert "major house keeping, there were cobbwebbs in here"

This reverts commit f797a55794e9778af16a6dd01486758f99e22641.