Refactoring; Delete unused code.
Make file split by one bit when distributing.