Removed temp class