Cleaned up Niki mess