Removed non-working elements