Removing abstract logic (ref #43)