Cleaned up unnecessary bits.