Revert "Final submission"

This reverts commit e6aa6460ac13b64f61735b5f4869f66ff4eaa794.