Code review corrections. Removed needless files