More code cleanup, moved to new dev account