Removed main-loop