Ticket 005

Remove unused code