Removed buggy implementations