Cleaned up some weird code.