ignoring dstore
removing aold report
duplicate classes in apache, final version before email