Revert "Added total dps and some minor code cleanups"

This reverts commit 9bfe4bfa7f643e890e93432f370131076e4429e7.