Refactored last checkin, still not good but at least the specific rendering is removed from the library