Removed Buggy Features