Removed buggy stuff