refactor of startup behavior
removes deprecated files