Revert "keeping score and waves"

This reverts commit c0f5db26938d49ec9ab4e7b14fd9da4562bea294.
fucking conflicts!