Cleaned up some of the disposal logic and removed some messages to console