Removed unnecessary timeouts

Signed-off-by: Daniel Koo <danieljamin.koo@gmail.com>
Merge branch 'master' of https://github.com/kood1/MSL