Cleaned out a lot of unused arguments