Issue #408 - Removing unused code
Issue #408 - Adding android layout