Clean up...to get working