Removed buggy/old code