Revert "Team12 changes"

This reverts commit 0aec55712f6cce179046c6126c1fd03f8e7a3ab2.