Removed a few hardcoded elements