general cleanup of custom component
done with next rev