Revert "- added JustArchi optimizations"

This reverts commit 2f6a3bbe8fde924137c533a13dadd7ece0220c3e.