Removed legacy stuff which is no longer relevant