Cleaned up parameters

Some legacy stuff removed and cleaned up