Cleaned up Dismissal