Cleaned up respurce system