Cleanup of angular