Remove extraneous functionality