remove common source file, refactor another