Remove obsolete code to store org to project

Some cleanup up code after @rollick 's review to another PR that I merged in myself (BAD!).