Code-fix begin. Removed irrelevant files