Actually this is probably laziness, this needs to be cleaned up at a later date.