Cleaned up to what I actually use.