Cleanup not used code