Cleaning up dashboard controller