Revert "optimization for mobile & bugfixes"

This reverts commit 4a34ad6e5984f21715d6b35ff875375d1307bb35.