Extensions and cleanup!