Cleaned up unused bits.