Removed taglib headers and include-specific code