Cleanup and remove redundant methods.