Removed temporary WIP code