Clean Up Resources

In progress