Removed update loop mess