Cleaned up dead advert code
Removal of commons-lang dependency