cleaned up stuff only need when under development