No longer needed, caused some issues too