Removed extraenous cleanup