Dev Code clean up