Remove some dead code.

Signed-off-by: Anurag Priyam <anurag08priyam@gmail.com>
Refactoring - no need to use begin...end within method body.

Signed-off-by: Anurag Priyam <anurag08priyam@gmail.com>
Refactoring - be more expressive.

And added some FIXME annotations for lated.

Signed-off-by: Anurag Priyam <anurag08priyam@gmail.com>