Added empty cases
Removed some old commented code

Signed-off-by: Jeremy Ho <jujaga@gmail.com>