removing hardcoded elements