Clearing bugs due to poor init dev work