Cleaned up servlet stuff