Removed some half-finished code