Remove old/unused code

Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
Merge pull request #3 from simonjbeaumont/remove-dead-code

Remove old/unused code