Minor clean-up of License header + refactoring of equals + removal of unused property that is mapped by another entity.
Removed commented-out lines of code
Removed commented-out lines of code + removed reference to scanning of catalogue drop points (will come later - right now it only creates noise).
Merge origin/master