remove temporary hack