code cleanup & refactoring / admin locale migration & fixtures