Revert "Working startup, working detect"

This reverts commit de619a367a6d8284e58af22b2144d575c4fb43ec.