removed unused code and added support for jstl