Revert "[Updated]Fixed respawn timer to 5 mintues. Also cleaned up the code."

This reverts commit ba4028608882d58809cd4457cde790f2ee304393

Change-Id: I24ceeab790d83669b28e219d77040ea93d8980db
Merge "Revert "[Updated]Fixed respawn timer to 5 mintues. Also cleaned up the code."" into unstable