Cleaned up some non-working elements