Cleanup. Added warnings