Removed commented code-Arch