remove unused code, fix small bug regarding what is in includeme()