Removing dc params
Refactored