Take out old OSK code - needs to be totally reimplemented