Remove WIP code