Removes dependency on sunspot