Removed deprecated __FILE__ calls