Cleanup and general changes for setup !