Cleanup and wire up