Simplifying remove bucket function
[#76732214]