reduced some code files
reduced code files