House keeping. Delete code which is not needed anymore.