Cleaned up from taxononmy mess